merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 8 Dec 2011 01:41:32 +0000 (10:41 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 8 Dec 2011 01:41:32 +0000 (10:41 +0900)
commit1924591f11d009a1c575f24f386ed9bac48e91e6
tree3fa606cab2180dcb96e64d91eadd3f1e15b34787
parentdac8d930669e0f02692e77fff587332846fd9457
parent8f54e94b5dd99c0fd6efe76e497cc207081ecc1d
merge trunk